bind: don't break IPv6 support

What started in #20183 as a attempt to clean up noise in the logfiles,
turned out to be causing denial-of-service for dual-stack and especially
IPv6-only environments.

Breaking core network functionality cannot possibly be less important
than cosmetic issues, and those affected by log spam can avoid it via
other means (e.g. "query-source-v6 none;" in named.conf).

There's no reliable heuristic for determining whether there's IPv6
connectivity at the time bind is started which will catch any and all
corner cases, as discussed in #26327.

So, remove this logic for now. If a suitable heuristic can be devised,
it can always be added in a subsequent patch, but I have my doubts.

(Also, quote one variable to make shellcheck happy)

Closes: #26327
Closes: #20468
Signed-off-by: David Härdeman <[email protected]>

diff --git a/net/bind/Makefile b/net/bind/Makefile
index a52d5a7f05e422c7b38122b4a23a891acf4ce156..9c4f8c3f801316c13f349f9e5385015d47b6e62e 100644 (file)
--- a/net/bind/Makefile
+++ b/net/bind/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bind
 PKG_VERSION:=9.20.11
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 USERID:=bind=57:bind=57
 
 PKG_MAINTAINER:=Noah Meyerhans <[email protected]>

diff --git a/net/bind/files/named.init b/net/bind/files/named.init
index fd9130be0ae810fe6632845082c23ce5adbd8a79..08a142e3ca39931e2963547f3b3cc0428385df84 100644 (file)
--- a/net/bind/files/named.init
+++ b/net/bind/files/named.init
@@ -33,7 +33,7 @@ start_service() {
        done
 
        if [ ! -e $lib_dir ]; then
-               mkdir -p $(dirname $lib_dir)
+               mkdir -p "$(dirname $lib_dir)"
                ln -sf $zone_dir $lib_dir
        fi
 
@@ -43,14 +43,8 @@ start_service() {
                chmod 0640 /etc/bind/rndc.key
        fi
 
-       if [ -z "$(ip -6 -o route show default)" ]; then
-               args="-4"
-       else
-               args=""
-       fi
-
        procd_open_instance
-       procd_set_param command /usr/sbin/named -u bind -f $args -c $config_file
+       procd_set_param command /usr/sbin/named -u bind -f -c $config_file
        procd_set_param file $config_file $config_dir/db.*
        procd_set_param respawn
        procd_close_instance